Merge branch 'upstream' into debian/sid
authorLuca Bruno <lucab@debian.org>
Fri, 25 Nov 2016 23:12:01 +0000 (23:12 +0000)
committerLuca Bruno <lucab@debian.org>
Fri, 25 Nov 2016 23:12:01 +0000 (23:12 +0000)

Trivial merge